From 4d524ab469425976fa9bbe5d03f75d6feb69a8a0 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 5 Nov 2015 13:13:37 +0100 Subject: [PATCH] widget: Avoid critical warnings when disconnecting plain GtkEventControllers This signal is only set on GtkGesture objects, so check it's really there before disconnecting. --- gtk/gtkwidget.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index fe28d1a9fb..78cfd5e002 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -17500,7 +17500,9 @@ _gtk_widget_remove_controller (GtkWidget *widget, if (g_signal_handler_is_connected (widget, data->grab_notify_id)) g_signal_handler_disconnect (widget, data->grab_notify_id); - g_signal_handler_disconnect (data->controller, data->sequence_state_changed_id); + if (data->sequence_state_changed_id) + g_signal_handler_disconnect (data->controller, data->sequence_state_changed_id); + data->controller = NULL; } -- 2.30.2